Eliminate a race to create info/ during the build

Add 0008-A-race-to-create-info-has-been-eliminated.patch with the
relevant changes.

Thanks to Paul Eggert <eggert@cs.ucla.edu> for tracking down the
problem and providing the fix.

diff --cc debian/.git-dpm
index 978be153e13f41f9493655b1acb8bc73554d74ad,0000000000000000000000000000000000000000..c9c45df3e6d21091970fadd05195cbdac9344150
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- 6e1086117ac5748816389e9df27ecc07984e8c9f
- 6e1086117ac5748816389e9df27ecc07984e8c9f
 +# see git-dpm(1) from git-dpm package
++ab7f768c51efc79f100d01ce4f3d6c5bad12be32
++ab7f768c51efc79f100d01ce4f3d6c5bad12be32
 +fa54b24bfb46d6799598ccd7639c5ad7c02df252
 +fa54b24bfb46d6799598ccd7639c5ad7c02df252
 +emacs24_24.4+1.orig.tar.bz2
 +b73323c62f01f42ddf6c57eada1a4f58cf0806e1
 +24395968

diff --cc debian/patches/0008-A-race-to-create-info-has-been-eliminated.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..271ac1c83ae9ddd04b8b0d38d72338a2f1c23fe8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0008-A-race-to-create-info-has-been-eliminated.patch
@@@ -1,0 -1,0 +1,27 @@@
++From ab7f768c51efc79f100d01ce4f3d6c5bad12be32 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Thu, 23 Oct 2014 10:24:22 -0500
++Subject: A race to create info/ has been eliminated
++
++Previously something like "make -j2 info" might fail because there was
++a race to create info/.  This backport was adapted from the broader
++patch listed below.
++
++Origin: backport, commit: r118181, a385f9e187ceec0610f000158305c9d5cb987dbd
++Added-by: Rob Browning <rlb@defaultvalue.org>
++---
++ Makefile.in | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/Makefile.in b/Makefile.in
++index e5d98d2..540b4b3 100644
++--- a/Makefile.in
+++++ b/Makefile.in
++@@ -969,6 +969,7 @@ info_dir_deps = ${srcdir}/build-aux/dir_top \
++ ## but then we would need to depend on info-real, which would
++ ## slow down parallelization.
++ ${srcdir}/info/dir: ${info_dir_deps}
+++     ${MKDIR_P} ${srcdir}/info
++      tempfile=info-dir.$$$$; \
++      rm -f $${tempfile}; \
++      thisdir=`pwd`; \

diff --cc debian/patches/series
index 2708556d91738324a9a9106435ce1b67ba758007,0000000000000000000000000000000000000000..1efaa1e7f23a55f0d24b157d4d954ba979c819f1
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,8 @@@
 +0001-Prefer-usr-share-info-emacs-24-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
 +0007-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
++0008-A-race-to-create-info-has-been-eliminated.patch